Removed code duplication in the handlers