Updated code and classes from EF6 update