Improve worksheets support