Add universal support