Add Template container feature