Improve defer render - new features