Tweaks to store and update for database