Updated tables to have proper referencing.