Fix Templates

Template library updated to most current