Added draft support to NR+Activity+Tools