Added namespace prefix for classes