Add @page and @namespace support