more changes for adding more plugins