Updates to rules manager