Changes made to be compatible with the DevTools plugin