#660 Included references to assessment variable domain object