Changed store to pull from db not identity map