Better typing for Payment structure