Pull request for better EF support

Thanks to @chaowlert for the pull requests that better support EF and correct a hashkey issue.