fixup! Add support for more data entry