Added annotation feature to handler method