Added marker support.