Changed Defs to enum from class