Updated to use Entity Framework 6.1 with public mapping API