fileStorage extracted + fixes