More work on supporting new image libraries.