Code review changes for domain attributes