Refactored handler class hierarchy, validate user handler works