Patching for the new vector class