Lots of rendering enhancements
Add missing custom data