Added current table functionality