Move overriden methods into helpers to prevent breakage in new rails versions