Fixed ability to override the template