Updated how resources are stored and retrieved to simplify client api