Add moving indicator support (partial)