Adding templates back in
Updating libraries