Added invoice and payment models