We definitely need a better way to add custom facts to an image. Adding it to the TODO pile...