added support for missing objectIdFields