Refatoring Plugins