changes related to namespace handling