Add package model by cherry-picking commit 8cd8601.