Bug 3654: Introduction of latest topology model