Updated to reflect the recent changes in CoreComponents