Moving away from JDO