Updated shell class