Added classes up to 2.5