Added mesh support