Add remote_images
Refactor for remote images