Add cloaking and scanning