Make language align with policies and more general