Tidied up multiple foreign keys