Removed dependency on plugin