Improve script modules