Changed Image Handling to New Syntax