Add quote number support