enhancement on 'snap' command