Rework datamapper to use a package type field