Updated to reflect the latest core changes