Added the rest of methods to the service
Most of the structure