Added a field to get mot precise on the address plus minor changes