Enhancements to move plugin towards class based