Revise image handling and add missing image handling as well