add models & fix associations