[IMP] account_payment_extension: Better code