Fixed typo :/
Added one to one component
Fixed empty component values