Improved Handler handling