Moved packaging system to framework level