Add more polyfills and load them at startup
Better logging