Updated to latest JDOM which supports generics