Redid relation declarations to be more sensible