Changed data upload indexing and add chart draw option