Small refactoring to ease behaviour overriding

* small refactoring to ease behaviour overriding