Better handling of ServiceMatrix packages.
Fixes #117
Fixes #122