Update template (should be add with previous two commit..)