Add extended shell availability checks (see #23)