Brought engine up to date
Converted Vector instances to new template