FEAT: Shell refinement added