Added ComponentBaseLayer