Adding support for marker content