fix: switch code automatically where possible by using impl class

fix: switch code automatically where possible by using impl class #5358