Add support for non-Rio services to have additional attributes applied