Some changes for shell