Add initial specs
Update template syntax for 3.2