Adding conditional filesystem support