Renamed DefaultHandler to more appropriate DefaultPropertyHandler.
Renamed DefaultHandler to more appropriate DefaultPropertyHandler.
Moved some utility code into helper class EnumUtil for external reuse.