Rework image storage implementation, address some of the review comments