Added subcomponent parsing