Added id serialization to datastores