Added support for Console, Content Assist,...