FIX: `idProperty` and therefore `elementId` should be optional