Extended functionality add breaks v2