[Service, Controller] Controller API changes and Services changes based on controller changes