Added initial support for OS X as a server