Add entitas, data layer and service