Updated scheduler to include edge mapping