Added queirs for VM, project derailed.
Refactored models to target MVP