Add support for commented opening lines