Code rewrite to fit the new base model