updated parser and added template