Refactor geddocument (jpa ready !)