Updated model to ForeignKeys