Refactor mapping functions and enhance DTOs with additional fields and optional properties for the forms
