Apollo 4299 domain model mapping tweaks

Can we cast the value