Updated to use @Table support and removed custom ListWidget