Adds support for custom internalId names