Updated sample with map