Improvement | Fixed Shell check logic, added a get shell function