Fix coupling with Cms