Added image loader and storage