added uniform handling policy.