Lot more changes, Spring screwed the whole Topology