Improvements to image loading
Refactor an interface which was big