IP and CD features added