Add universal build