Add basic entities and relations