Updated payment handler