Get rid of AdditionalPropertiesService, add fetch to auth token temporarily