Fixed the bug in the mapping for package data-model