Finalizing version 1.8 changes (edges option)