updated DTOs, facades: WIP