Adding support for tables - working on dependency cycle