More updates for the cms extending tutorial