Renamed and added corresponding models