Changes to the Edge classes to make it more streamlined