Added address fields to Company