Now supports multi-shell data