Use Finite with Payment as well
Use constant for graph names