Improve template for support other module