Added object parsing