Internal plan for 2.0 and other