Added types for OSX