Use multimap in scheduler
Cleanup imports