Added storage services and some functions to helper services