Add support for dynamic object name.