Moved in from cafe.image.core package