Added arguments to Handler annotation and Handler Metadata.