Added a proper Image Storage