Added proper SHAR name extraction