Updated non-rootless component handling