Migrated code to helpers-gem