More work on table component