Adding details and planning for Version 2.0