Remove the need for plugin