Simplify the package factory methods