Added support for marker setting