A few more refactorings to use local version of components