Updated usage with generic mode