Qatar reveal plans for 2004 circuit