Update sqlite branch with templates