Added more code to JS Modules