Added data access code and domain infrastructure