Added support for dynamic object properties