Modify core code and index.js