Update for Azure Changes

Now azure uses strings for IDs (guids) so update for this.
Also default string to string.empty not null.