Updated to support new rendering functions