Map composition to PDF - improve