Stubb and defaults done, template updated