Simplify storage implementation