Added safe json parser