changes toward making cms instances