SelfWrapper refactoring, reduces performance