Added identifiers to data objects for database setup