added scheduler + next domain refactor