Add support for new markers