Rules addition, refactoring