Improved json property serialization