Added marker matching