Added support for University Health Service

And manifest.json formats better.