Updated core framework for JS