Some additions for testing policy perf