Removed namespace mapper for now...