EF 6.1 support