Moved the handler invocations to a separate behaviour