Attributes table, ad-hoc diagram and relations table -- completed