Added EF and DbContext. Combined INT and USClasses