Added configurable match length