JDO structure modified