Additional data layer functionality, adding domain layer