Change implementation to use template tag