Change to use JSON.parse to remove constructor