Moved helper to helpers