Feature: always match signature in waterfalls and catch
Remove unnecessary dependency, version bumped