Updated data store to match backbone expectations