Add option to set comment xpath