Added wmm feature