upgrade cms resource handling