added namespace handler