Refactor subject scheme use and enable in profiling module #1756