More robust invoice features and better mappings