Add finder pattern decorator
Merge branch 'feature/finder-pattern-decorator'