Proper handling of computers and tables by c4

Proper handling of computers and tables by c4