Updated to new Spacebars syntax