Change to storeByReference