* Minor reformatting
        * Rework warning message for non supported annexes
        * Update reference output