Fix Component support

Fixes #10