removed dependency on LinkedHashBasedTable