Updated pymapmatch