Creating few more entities and enums