These types are the same, except for Database.Empty

I managed to have backwards compatibility with the frontend format,
hence the frontend doesn't need any changes.