Updated service entities to use abstract classes
Updated welcome entity attributes to use abstract classes