Added optional shell behavior