Changes in Unit plugin