Add images and refactor provider