BUG: Only extend comment class if it is available in the manifest