Correct Connections and Added next classes