added namespace handling