Refined the template, added proper input names