fixed datamodel issue and added other base VCs