Added preliminary support for provided services