Adding other components to self-server