Little model refactoring
Add topology services