Some more updates to use the version and make this more foolproof