Type definition added, without tests yet