temporary adaption to make it work with cms