Fixed compile errors from Defs.java
Converted Defs to enum