Mostly template changes to reflect new classes