Added support for non-rootless components