changes to work with driven plugin