Began adding entities and services