Additional modifications to upgrade plugin functionality