Added the ability to have nested components