Added Table definitions