added support for some more services