Making model building more robust