Update policy as per use case review