Fix cms service