rewrite of services to make calls more intuitive and maintenance easier