updates at store() method, a better implementation was provided [folder and etc...]