Suggestion for v2.0