NEXUS-7629 Component source API tweaks