Template and WrapToy Additions