Added (ugly) DynamicObject support