Apollo 4299 domain model mapping tweaks

Worth type hinting?