Changes to js and main class of the framework