Removed fs dependency