using an actual directive for the table instead of static; tables refactored to help guarantee ordering