Update formatting of externalstore classes