Updated to match shell key changes in core