Added definitions for tables