Added interactive support