Update storage method

1. refactored storage method