changes for new policy class