Implemented component manager methods and other changes