WIP. improve validator handler.