Updated  User and VM objects based on ERD.