Added some new/missing attributes
Added file handle caching