Work with storage instead of godict