Fixes services to use methods for retrieving data