merged back in the configurable model and roles table