Rebase your 'Network elements modeling as objects' patch

It could introduce some mistakes during rebase. Please review it.