removed necesity for base invoice class changes