moved storage to services in order to fix fatal error