PASS/MAP Review #3

More EF review