Updated object parsing/calculating