Improve filesystem integration