Improved the readability of the ComponentManager