Adding simplify namespace to all