Reworking the class wrappers