Added more components
Added parent element selection