Added topology generator