Updated version for EF6 driver too