Moving custom vocabulary to CommonRepositoryModel