Improved Darwin support