Add namespace, update FixtureMap