Move some methods to InMemoryStorage

closes issue #21