Added optional flag to enable optional packages