Added basic table functionality