Improved field name handling

and get existing signatures