1.4b. Added support for match endpoints.