Added SOPM for package generation