Refactor gedMessages (jpa ready ?)