Added attribute list support to the parser