Added missed file + obligatory namespace fixes.