Adding existing V1 prototypes/migrating to V2