Update some code to object changes