added attributes to structs for app and service and set all default string values from empty string '' to 'null'