Refactored Systembus classes to work a bit better.