Add Mac compatibility