Removed dependency on some network entities so client can be modular.