Updated config & Storage