Added time and command_not_found_handler