Service and wrapper new methods and improved design