Improved encapsulation, removed global hub