Removed custom_handler