Refactor, Add Foreign Keys