Began to add support for multiple service references of the same type.