Added "All shells" support to relevant functions