Improve identifier capture and add field decl