[Master] Adding basic templates