Removed timeout and fs specific options. Moved them as defines.
Ongoing work for attr.