Refactoring + eager loading support for EF + new specs