Better Shell class finder