Fixed merge issues, added methods

Added 'rule-added' and ‘rule-updated' methods