Added dependency to storage
Working on tests