Added base entities and dependencies between them