Converted to use Component