Add option for requiring quotes