Components Manager improvements
Missed merge requires correction