Updated models and databases to reflect associations properly