added namspace handler