More splitting up of invoice generation