refactored physical structure/added ef provider