Improve managers performance
Refactor component management