Added governors, schedulers and made some tweaks