Adding Image.Location attribute and further constraints