OSX handler refactored and renamed OSX integrator