Working on #90 for entity framework.