Moved image loading out of pojo