NPCI would soon allow Wallets to work with UPI