Update TODO
Find a better way to retrieve the image source