Added relations back to db models