Removes common dependency and upadtes storage to have an interface