Null checks
Use the enum toString() instead of name