Removing deprecated JDom dependency