Better invoice creation, added models