Moved underscore to the component