Made Naqudah generation optional.