Closes #131: Use service identifiers instead of class names.