Made to work, in patches, with hadoop