Modificaitons to add managed entities