Updated renderer logic to support new Event system