Added support for markers (as Empty objects)