Added optional package selection