Updated to reflect change in package structure of data model class.