framework: updated tables