(Cal) Finalize the changes of ChurchCal and ChurchService and ChurchResource