Changed DataTransferObjects to Entities