Add handler for API >= 16