Add support for hint