Version 1.1
   -> Removed unnecessary wrappers