Finished factories, added argument for get_storage