Adjust store logic and debugging