refactor Storage to use load_content/parse_from