Made system file methods simpler and more consistent