Add support for invoice