added simulator and map support