Improved rendering, updated put method API