Changes to follow backbone/underscore templating