Adapted components.xml