Switch away from old types module, oops