Add support for order callback