Added DataHolder to hold Service objects and alter classes accordingly