Issue refs #1598: reporting model reimplemented in nhibernate