Moving fs requirement to where it is needed for client side compatibility