Add conditional processing