Add more features to Invoice

:volcano: