Updated framework with js template