JSON Support and performance improved