Updated objects for parsing