Changed wrapper to non generic and with proper functions