fwr: changes to allow storage export