Refactored renderers