more complete EF classes added