Added Teleport to CommandHandler and Main