Changes to Services and Controllers