Adding configurations & fixing policy/pap charts