changes to storage framework