Render it generic and add – support