More Calibre integration.