Better mesh support