Updated Entities in Aim Admin and Aim Application and add Enums