Added Edge and Node class