Modified Template Service