Update to rule based system