Added partial support of component, partially added logs