Added changes to Store Model from Ben
Added changes from Ben
Additional changes that were missed from previous commit