Moved more state variables out to CameraState model.