Updated issues with template