Updating wrappers
Remove unecessary service for now
Merge pull request #1048 from andrerod/dev

Updating wrappers