Updates for the new version of geddy and model