Added FKs and brought table vale out of sub-object
trying out a "context" approach to analysis