#5 - Fixing dependency order between network classes.