Better template use