added marker support