Better handling response type