Added ServiceLocator and additional contracts in DataAccess