Add new changes from CLEAN, implement context.js