Added data structures to makerules