moved storage in separate module