Fix Images api  changes + key builder call