Updated the behavior of ThetaModel