Updated contract tools from itsnotlupus