Improve package creation to consider entertainment optional