Implement missing storage interface
Fix query string parser and trim unused import