Adding objects for managing state and updating calibration object