FileStorage and AbstractStorage done