Should database_id be optional to maintain compatibility?