Added some more helpers for rendering