More additions to templates etc.