JSONx support added