Adding component support
Adding component support