Updated to model 0.2.1