Modifications to TableHandler