Add excludeComment option