Changes to enable the Rest option