Added invoice support