Moved Services to Controller