Created a simple plugin architecture, decoupled the Service Browser