#7 - FIXED - Components to be in singleton scope by default