Adding SELECT AS support