Improved resource store (merged with data store)