Half way rewriting policy stuff in enforcer.cpp