Removed new() keywords and use component constructor helper.