Added cloverty scan support