Updated the model class parsing methods.