Some minor updated to the Object code