Updated with image storage and retrieval