Add ability to use extra fields from shape file.