Added xmlns and fixed after older refactoring