Changed datastorage, getter and setter