Removed the InternalId value class in an attempt to avoid bridge method collisions (it's a compiler bug)