Improve capacity scheduler strategy