Performance improvement: remove some string manipulations.
Performance improvement: remove objectId manipulation.