Fixed key handling, added application id, multiple matchers and general bug fixes