Added TODO for version 2.0