Added classes for a first iteration