Maintain legacy app until utils migrated