Additional changes because of namespace change