Many minor changes to policy framework to help with performance and muti-threading

...-threading