Wrapper moved from interface to abstract class