Add checking for images