Added TIPs 48 & 49