New changes for policy compilation