Improved  domain object. Small fix.