Added safe component rendering based on schema