Add CML support for Window tag