Ensured that template service always returns a Promise