Added XLS and XLSX support