Modifications to policy class