Made Filesystem getHandler injection proof