Added filesystem resolver