Result handling improved