Adding support for object notation