Correctly implemented Handler. Added trace-tags.