Add invoice master. Fix imports. Fixes in master classes.