Updated objects parser