Updated to new component