JSON and JDO support added