Changed regex, dict lookup for custom field types not necessary.