Adding support for mac os x clients