added rudimental support for optima:match