Add remaining templates