#1 - Updated entities and created initial repositories and services