Updated Service classes on 25th-NOV-2014