Defines doesn't make sense. Can we rename dialog2 to ims-dialog so people understand that it's special for IMS?Right now it would be impossible if we want to be backwards compatible. I suppose we could look at pre processor defines to decide which version to use, but this could be equally as messy