Get rid of wrapping class