Added new package system for optimization