Added Network based classes