Added server functionality for all OS