Added base entities for project