Improve template reusability