Updated to reflect cms core changes