Fix coupling to cms module