Better object parsing