Added frequency mapping support