Added Client & Server support