Refactor a few domain models