Added incrementing to scanner, parser & entities.