I added support to get images names too