Added date support
Reorganizing request_handler