Modify storage processing (remove gen_server)