Added support for &...; entities