Add support for new cursor values