Fixed dto mappings