Refactor with new renderer