Improve script module