Preliminary work on table directive
Merge