Renamed and added preview classes