Optimize
Add cone and cylinder primitive geometry