added enums and made changes accordingly in datalayer