Added TODO messages to class Handler