Add Component support - fixes #1