Removed storages dependancy.