Adding check for enums