Add support for dynamic role selection on availability.