Added base classes and EF mapping