Adding more invoice functionality