Add expand table support