added support for raw-value services