Updated set/remove-available in dispatcher