Added mac integration