Add default value for id
Fix adding and removing docs to VCs and add tests