fixes for PLFM-2134 and PLFM-2135
added new fields to the DAO
Merge pull request #616 from john-hill/PLFM-2134

fixes for PLFM-2134 and PLFM-2135