Added row and column expansion to support more complex spreadsheets