Update marker events with new implementation