Add support for statement descriptor