added Device and map