Added Company update - tested partially (including locations)