Update mapping for DTOs, change mapping function for resources to match server response format. Fixes #35912