Cleaned up the plugin and have a full solution for instrumentation coverage