Add TopPriority and Rest for use with template