Added: add component support