Missing namespace(s) fixed