Update for marker use-case