Update for changes to Images

Should fix #28