fields and methods parsing improvements.