changed header and storage and dictionary to a property