Revise OSC plugin

This is a revision of https://review.openstack.org/#/c/64703/