Use proper json serilaization