Improve respond_to support