Small reworking of entity construction