Improvements to enable the library to be more broadly applied to different data models.