Added lookup to policy and project