Added media-query management using map structure.