Tweaking EF layer a bit