Updated marker setup