New changes for Add Policy