Added support for EF