Add support to fields with double quotes
Fix imported package name