Better handling for create/import fields