Refactored FKs a bit and made them more explicit.